my trunk.. still needs some work

#23
#31