#1, start refactoring.
#2
anyway... ya.