Move some methods around
Merge pull request #67 from greboid/framemanagers

Move some methods around.