Refactor more; strip uneeded features, conform better to desired style
Start pulling in code from Javelin/electroslag
Exception Handling code from Javelin.