rearrange things + add objects

fixed #3 by adding a new method and working on #1